add the owner name to the comment added message Change-Id: If4d232fb6305b8fdea3d1f902c9328e691cee8f0 (cherry picked from commit f4b51bb1e020930a5edfa1ea39cba40afcd613b2)
diff --git a/src/main/java/com/cisco/gerrit/plugins/slack/message/CommentAddedMessageGenerator.java b/src/main/java/com/cisco/gerrit/plugins/slack/message/CommentAddedMessageGenerator.java index 6a477b9..c91ab89 100644 --- a/src/main/java/com/cisco/gerrit/plugins/slack/message/CommentAddedMessageGenerator.java +++ b/src/main/java/com/cisco/gerrit/plugins/slack/message/CommentAddedMessageGenerator.java
@@ -81,7 +81,9 @@ text = new StringBuilder(); text.append(escape(event.author.name)); - text.append(" commented\\n>>>"); + text.append(" commented to "); + text.append(escape(event.change.owner.name)); + text.append("\\n>>>"); text.append(escape(event.change.project)); text.append(" ("); text.append(escape(event.change.branch)); diff --git a/src/test/java/com/cisco/gerrit/plugins/slack/message/CommentAddedMessageGeneratorTest.java b/src/test/java/com/cisco/gerrit/plugins/slack/message/CommentAddedMessageGeneratorTest.java index ce16c7f..71cf467 100644 --- a/src/test/java/com/cisco/gerrit/plugins/slack/message/CommentAddedMessageGeneratorTest.java +++ b/src/test/java/com/cisco/gerrit/plugins/slack/message/CommentAddedMessageGeneratorTest.java
@@ -60,6 +60,7 @@ private CommentAddedEvent mockEvent = mock(CommentAddedEvent.class); private AccountAttribute mockAccount = mock(AccountAttribute.class); private ChangeAttribute mockChange = mock(ChangeAttribute.class); + private AccountAttribute mockOwner = mock(AccountAttribute.class); private ProjectConfig config; @@ -156,6 +157,8 @@ mockChange.project = "testproject"; mockChange.branch = "master"; mockChange.url = "https://change/"; + mockChange.owner = mockOwner; + mockOwner.name = "Owner"; mockAccount.name = "Unit Tester"; @@ -165,7 +168,7 @@ mockEvent, config); String expectedResult; - expectedResult = "{\"text\": \"Unit Tester commented\\n>>>" + + expectedResult = "{\"text\": \"Unit Tester commented to Owner\\n>>>" + "testproject (master): This is the first line\n" + "And the second line. (https://change/)\"," + "\"channel\": \"#testchannel\",\"username\": \"testuser\"}\n"; @@ -191,6 +194,8 @@ mockChange.project = "testproject"; mockChange.branch = "master"; mockChange.url = "https://change/"; + mockChange.owner = mockOwner; + mockOwner.name = "Owner"; mockAccount.name = "Unit Tester"; @@ -200,7 +205,7 @@ mockEvent, config); String expectedResult; - expectedResult = "{\"text\": \"Unit Tester commented\\n>>>" + + expectedResult = "{\"text\": \"Unit Tester commented to Owner\\n>>>" + "testproject (master): " + mockEvent.comment.substring(0, 197) + "... (https://change/)\"," + "\"channel\": \"#testchannel\",\"username\": \"testuser\"}\n"; 